Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 18:19:24 +0000 (11:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 18:19:24 +0000 (11:19 -0700)
commit3529b1c7ecb6ba430902aca1bb6337cfb263916f
treecefacc4fa91fc51ba7f4caccf6d94a8149764cea
parent9b5441729ac124fb73de1074a63d1fe778d826cf
parent510ee9eb62ba74b4917a63b18a026f731b510ad7
Merge from trunk.
38 files changed:
src/ChangeLog
src/alloc.c
src/buffer.c
src/character.h
src/data.c
src/dbusbind.c
src/dispextern.h
src/dispnew.c
src/editfns.c
src/eval.c
src/fileio.c
src/fns.c
src/font.h
src/frame.h
src/gnutls.c
src/gtkutil.c
src/insdel.c
src/intervals.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/lread.c
src/print.c
src/puresize.h
src/search.c
src/sound.c
src/sysdep.c
src/term.c
src/textprop.c
src/undo.c
src/w32fns.c
src/w32menu.c
src/window.c
src/xdisp.c
src/xfns.c
src/xselect.c
src/xterm.c
src/xterm.h